[scudo] Skip test if mlock fails. #168448
Merged
+11
−11
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Some linux versions might not support the mlock call, so skip that part of the test if the mlock fails.
llvmbot
added
compiler-rt
compiler-rt:scudo
Member
|
@llvm/pr-subscribers-compiler-rt-sanitizer Author: Christopher Ferris (cferris1000) ChangesSome linux versions might not support the mlock call, so skip that part of the test if the mlock fails. Full diff: https://github.com/llvm/llvm-project/pull/168448.diff 1 Files Affected:
diff --git a/compiler-rt/lib/scudo/standalone/tests/map_test.cpp b/compiler-rt/lib/scudo/standalone/tests/map_test.cpp
index afdfe5be85fb6..9d1a35c44679d 100644
--- a/compiler-rt/lib/scudo/standalone/tests/map_test.cpp
+++ b/compiler-rt/lib/scudo/standalone/tests/map_test.cpp
@@ -120,17 +120,17 @@ TEST(ScudoMapTest, Zeroing) {
#if SCUDO_LINUX
// Now verify that if madvise fails, the data is still zeroed.
memset(Data, 1U, MemMap.getCapacity());
- EXPECT_NE(-1, mlock(Data, MemMap.getCapacity()));
-
- EXPECT_EQ(1U, Data[0]);
- EXPECT_EQ(1U, Data[PageSize]);
- EXPECT_EQ(1U, Data[PageSize * 2]);
- MemMap.releaseAndZeroPagesToOS(MemMap.getBase(), MemMap.getCapacity());
- EXPECT_EQ(0U, Data[0]);
- EXPECT_EQ(0U, Data[PageSize]);
- EXPECT_EQ(0U, Data[PageSize * 2]);
-
- EXPECT_NE(-1, munlock(Data, MemMap.getCapacity()));
+ if (mlock(Data, MemMap.getCapacity()) != -1) {
+ EXPECT_EQ(1U, Data[0]);
+ EXPECT_EQ(1U, Data[PageSize]);
+ EXPECT_EQ(1U, Data[PageSize * 2]);
+ MemMap.releaseAndZeroPagesToOS(MemMap.getBase(), MemMap.getCapacity());
+ EXPECT_EQ(0U, Data[0]);
+ EXPECT_EQ(0U, Data[PageSize]);
+ EXPECT_EQ(0U, Data[PageSize * 2]);
+
+ EXPECT_NE(-1, munlock(Data, MemMap.getCapacity()));
+ }
#endif
MemMap.unmap();
|
ChiaHungDuan
approved these changes
Nov 17, 2025
🐧 Linux x64 Test Results
|
Contributor
|
Thank you for the fix! |
Collaborator
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/174/builds/27620 Here is the relevant piece of the build log for the reference |
Member
|
Thanks, this makes the tests pass for me. That said, I don't think it's a matter of "linux version" — I've reproduced it 6.12.53 and 6.17.3, on amd64 and arm64, in nspawn containers. My guess would be permissions or something else. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Some linux versions might not support the mlock call, so skip that part of the test if the mlock fails.